Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only send "Back to normal" if "Notify Back To Normal" is enabled #164

Merged

Conversation

SuperTux88
Copy link

send a "Success" even if the previous build failed, if only "Notify
Success" is enabled but "Notify Back To Normal" is disabled.

I need this because I have a job to build pull requests. Then a "Back to normal" is weird because the successful build can be from another PR than the previous broken build. The failing PR is still failing.

@jenkinsadmin
Copy link
Member

Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests.

@kmadel
Copy link
Contributor

kmadel commented Mar 14, 2016

@SuperTux88 Please fix merge conflict(s).

@SuperTux88 SuperTux88 force-pushed the notify-success-for-back-to-normal branch from 8733a3c to db4738c Compare March 14, 2016 13:59
@SuperTux88
Copy link
Author

done

@kmadel kmadel added this to the slack-2.1 milestone Mar 15, 2016
@kmadel kmadel modified the milestones: slack-2.2, slack-2.1 Nov 14, 2016
@samrocketman
Copy link
Member

Please rebase this on the latest master.

@samrocketman
Copy link
Member

Actually, the change is simple enough I'll try to resolve the conflict as part of a merge.

@samrocketman
Copy link
Member

There were no conflicts to resolve. I successfully tested this behavior and merge it. Thanks!

@samrocketman
Copy link
Member

Darn it wouldn't let me push a manually tested change.

$ git push origin master
Counting objects: 18, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (18/18), 1.48 KiB | 0 bytes/s, done.
Total 18 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6), completed with 6 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: Required status check "Jenkins" is expected.
To git@github.com:jenkinsci/slack-plugin.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'git@github.com:jenkinsci/slack-plugin.git'

Please rebase on the latest master.

send a "Success" even if the previous build failed, if only "Notify
Success" is enabled but "Notify Back To Normal" is disabled.
@SuperTux88 SuperTux88 force-pushed the notify-success-for-back-to-normal branch from db4738c to caeb8c2 Compare February 26, 2017 01:41
@SuperTux88
Copy link
Author

Please rebase on the latest master.

Done :)

@samrocketman
Copy link
Member

Thanks :)

@samrocketman samrocketman merged commit 73ba19b into jenkinsci:master Feb 26, 2017
@SuperTux88 SuperTux88 deleted the notify-success-for-back-to-normal branch February 26, 2017 01:49
@samrocketman
Copy link
Member

Feel free to subscribe to #296 for updates related to Slack Plugin 2.2 release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants